Allocate the titlebar height according to width

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index dbf7d797189a50ce3675037513e1b0e90440ce6e..59598b5a6277019499d7865ae30c732682acf411 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6046,16 +6046,18 @@ _gtk_window_set_allocation (GtkWindow           *window,
     {
       GtkAllocation title_allocation;
 
-      gtk_widget_get_preferred_height (priv->title_box,
-                                       NULL,
-                                       &title_height);
-
       title_allocation.x = title_border.left + window_border.left;
       title_allocation.y = title_border.top + window_border.top;
       title_allocation.width =
         MAX (1, (gint) allocation->width -
              title_border.left - title_border.right -
              window_border.left - window_border.right);
+
+      gtk_widget_get_preferred_height_for_width (priv->title_box,
+                                                 title_allocation.width,
+                                                 NULL,
+                                                 &title_height);
+
       title_allocation.height = title_height;
 
       gtk_widget_size_allocate (priv->title_box, &title_allocation);